dropping in FW v3.5.1