Merge changes from topics "VID-14", "VID-13", "VID-12"