Re-apply r175088 for bug fix 13622: Add paired register support for