requested review from @gcarron
marked this merge request as ready
mentioned in commit 4364dd76
merged