PLA-1643 CR changes