Merging #develop into #next


Bringing #next up to date with the latest #develop commits.