Regen configure

Merged Mark Andrews requested to merge regen-configure into master

Merge request reports