PLA-1487  merged to release 227

PLA-1487  merged to release 227