Merge branch 'lock-sones-via-fcp-317' into next