Feature/master/jcache master

master pull request of #3543