Merge 10.5.A.0.230 changes

Change-Id: I741846344411d85f506c931ec01f1b90996a8ea3