Merge "define RC_EXTERNAL type for recent changes"