Merge branch 'hotfix/01.04.01'
remove geoip guesser from this bundle
Merge branch 'hotfix/01.04.02' into develop