Merge/master to java7 2

Review by @gkossakowski