Merge pull request #10821 from itaiferber/4.0-encoders-eliminate-overlapping-exclusive-accesses

[4.0] Remove overlapping exclusive accesses in encoders

Author: itaiferber