Merge release-215 into PLA-1181 branch