Created by: monishdeb
Ref https://github.com/civicrm/civicrm-core/pull/15861
Sorry - logged into the wrong account there. Redoing review
@monishdeb can you address the feedback on this please?
Merging this without the code comment.
