Merge branch 'fast_containers' into develop