Pull changes for #1344 - fteproxy integration