Merge branch 'reflection_bottlenecks' into 'master'