No locking needed on sandwich layers: locks will already be placed on the constituting real layers, which is sufficient.
Merge branch 'byrman_one-lock-less' into byrman