Merge pull request from easylogic/develop fixed to load component order