Merge branch 'hotfix/1.1.3'
Check if config loaded
Merge branch 'hotfix/1.1.4' into develop