Latest set of develop changes in preparation for a new release.