Merge pull request #4421 from etactica/mos-nlocal-only-master