Merge "Improve RTL APIs"