RT#34237 v3 reconcile commit 9c67763013a6d16725f50637fe43bde5fe15bcd4