Merge branch 'tmp-fix-desc' into 'master'