Merge branch 'neil_capacity_planning' into v5.0