[8.09] [packages] merge r14667 (#5145)