Final RTM sync/ changes