Please review: Ticket 49057 - Fix tests failures on older versions of DS - rebased on master