[12722] Add forgotten part of commit [12713]