apply netty master changes