Fix issues caused by merge conflict
Fix merge conflicts merging 0741 into master