Merge change log from FW_5