Merge of Sony release 12.0.A.1.284