Merge branch 'mvneta-fixes'