For ENG-6718, make ee noticed there is a catalog change relates to dr.
For ENG-6718, change function signiture to fit actual intention.