Made changes for the Habitat Conservation topicå
Merge branch 'next-release', remote-tracking branch 'origin/next-release' into next-release