s2 rf param to 12, and cherry-pick update from simon
This tag has no release notes.