Merge branch 'mid' into 'master'