Merge "apply FW changes"