Merge pull request from easylogic/develop fixed grid layout drag tool