Added AM and RM builds. Merged in 3.8.0