merges changes from ppm-rr into sppmpa-rr