Bugfix in YT refactor
Merge branch 'master' into feature-peerreview