Bug fixes
Merge remote-tracking branch 'upstream/dev'

- bugfixes