Can we now merge master with fix_merge_commit?