Merge Delta changes from M16 to M18
assigned to @Vkamani
approved this merge request
mentioned in commit eb17de6b
merged