Merge branch 'plain' into 7mod