Version bump.
Merge branch 'develop' into poc-7+