MLDS-322 MLDS-588 add more affiliate context info