merged aled's patch 0001-For-latest-brooklyn-0.6.0-SNAPSHOT.patch