merged atlas changes