cherry pick
fix maven artifact id
update version number