Non-sprint task - fix for p1 issue http://bugzilla.bredex.de/1579 - part 2: missing RAP adjustments.