Merge branch 'hotfix-1.5.2'
Merge branch 'release-1.5.3'
Inlink old config file before build
Merge branch 'hotfix-1.5.4' into dev