Merge proposals

testng7 in Ubuntu has no merge proposals.