PLA-833 PLA-989 restoring changes