PLA-1404 removed changes from PLA-1468