[#2781] Backporting by request