Merge branch 'FW_BUG' into test