[Commits] 63e35e1c72b: Fix of PS after merge from 10.2.