Fix minification
Merge branch 'hotfix/fix-minification'
Fix the dependency loop; Rename vars for better readability
Merge branch 'hotfix/fix-loop'