Multiple fixes
Merge branch 'master' into feature-api