Got friendly forwarding to work. Thanks Steve!
Starting 9.3.3
Starting 9.3.4
Starting 9.4
Starting 9.5
Did 9.6.1
Did 9.6.2
Did 9.6.3