Merge 15.3.A.1.12 update