feat/17809 : code review

2 jobs for feat/17809_completeness_test in 23 seconds (queued for 19 minutes and 31 seconds)