Creating credit card contribution (back-end) creates blank address if custom data fields are selected

If custom fields are set when a back-end credit card contribution is submitted (even if it fails) a blank address is created of the primary location type.

(to make it work on demo you can create an authorize.net account with fake details as problem occurs before it is submitted)

The problem appears to occus in CRM_Contact_BAO_Contact::formatProfileContactParams around line 1734

if ( is_numeric($locTypeId) && !in_array( $fieldName, $multiplFields ) ) {
$data[$blockName][$loc]['location_type_id'] = $locTypeId;

Easiest fix might be to add

&& !('custom_' == substr($fieldName, 7)

to the if clause