#10946 - shipping address form fix