Merge changes from topics "VID-6", "VID-607"