CDB-235 #resolve Remove 'support address' behaviour