Merge proposals

java dev has no merge proposals.