Merge int-010.task-11 into master

Once approved, this will need to follow our release process and tagged.