Merge 10.5.A.0.230 changes

Change-Id: I52572fec6ba8a9c711834f5de92edf58d0d516f1