RAP/RCP single sourcing
Merge pull request #1 from amergey/master

Patch proposal for 376956 and 376419
Merge remote-tracking branch 'upstream/master'