Merge of Sony release 14.1.B.1.510