follow up from starterkit

Marian Stahlrequested to merge
mstahl_starterkit_followup into master

there will be more updates soon to also address issues that came with !1428 (merged)

Edited by Sebastien Ponce

Merge request reports