Merge branch 'video-log-statements' into 'stable'