PLA-1318 merge changes revert