Toggle resize off
Merge branch 'master' into interface-building