Merge branch 'master' into kino-dome-master