merge forward grouper-voot
GRP-1037: merge voot forward from 2.0, update version