[8.09] [packages] merge r15528 (closes: #5852)