Configuration fixes
Merge branch 'master' into configured-by-java