Grammar fix.
Merge remote-tracking branch 'remotes/origin/master' into compact
Consistent lock upgrade behavior when parent scope contains one lock from promotion or initially.
Merge remote-tracking branch 'remotes/origin/master' into compact