Merge branch 'develop' into fast_containers