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