Deliver update from master to java-blackbird