Merge changes from topics "VID-580", "VID-579", "VID-578"