Update layout branch to cleanup branch level.
Merge branch 'cleanup' into layout
Merge branch 'master' into layout
Fixed typo in help message.
Merge branch 'logic' into layout