WOFO-1072 added Account billing address fields