Merge pull request #901 from JamesGlover/next_release

Merge V4 work