0628 layout principle not complete
Merge commit 'bedada3a70b4bf517ac1d697ced98a03d262794c'