Fix BufferZone in right alignment
Comments By: vladislav Differential Revision: D4490
See #6451.
Fixed by rP26889