Bump version to 3.1
CFY-1609 merge commit