fix merge of 7519