fixes for browser run
Merge branch 'master' into timezoneHandling