Merge "Switch to the separate RS loading path."