[No review required] Integration

Merging integration branch back into dev. No review required as Andy and I have been collaborating and reviewing as we go.