[12688] Missing changes for last commit