The latest fixes and changes to the multi-view layout management code
Merge remote-tracking branch 'origin/master'