Merge pull request from easylogic/develop Support default layout