Merge changes from topics "VID-30", "VID-37"