Fix layout edit bug
Merge branch 'master' into 2.5