Merge branch 'video-ac-dc' into release