Merge branch 'netty-unit-testing'