Release 215 pla 1279

PLA-215 fix