Merge branch 'atlas_fixes'