Merge "Don't construct the RP context for KM <= 4.1" into sc-dev