Merge int-010.task-47 into master

This will need to follow our release process once merged