Merge changes from topics "VID-11", "VID-10", "VID-9"