PLA-1487  merged files into release-226