Add destination rewriting and the fix for BR#1750917.