Merge v2.11.0-m2-181-gc57c4f8 to java7

Review by @gkossakowski