Backported to FW_5_1.