Merge remote-tracking branch 'origin/master' into dev-1.3 plus more unit tests plus CircuitBreaker fix