Merge "Reinstate codes to enable RRO on system server"