Starting over merging atlrug3 into atlrug4