Merge changes from topics "VID-583", "VID-582"