Merge Commit fixes