RPMs, comps

Combines and replaces GH-652, GH-651, GH-649