FW02 aggregated changes