Merge branch 'hotfix/2.0.4'
Disabled turbolinks
Merge branch 'hotfix/2.0.5' into develop