Merge "Revert prototype RON changes:" into main