Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation