quick fix can not get layout
Merge remote-tracking branch 'origin/1.4.2' into 1.4.2