Merge branch 'om/remote-fix'