Merge consumer-sprint-21-bugid-52340 to dev