merge maven cherry-pick