Release 215 pla 1279

PLA-1279 fix