fix some possible concurrency issues
Merge remote-tracking branch 'remotes/origin/master' into proxy-and-spring-plugin