Merge changes from topics "VID-45", "VID-44"