Hotfix 0.6.14

this PR is into master, with cherry-picked commits from develop - sorry for the branching mess