Merge "RKPv2 spec clarifications"