Merge changes from 10.3.1.A.0.244 -> 10.3.1.A.2.67