Entity change lock experimental (test)
Merge remote-tracking branch 'origin/master'