Merge "Adjust speed feature for --rt"