Merge branch 'cr/103120/135' into 'meeting/LI73'

TS 103 120 CR135 - Delivery Destinations

See merge request !334