Merge "unhide RS apis"