some fixes
Merge branch 'master' into api-v15