Tickets Addressed in Release 18.1.0

  • DM-20664: Backport issue DM-20506 to 18.1.x branch [daf_base]