Maint 1.1 issue40008 chutney

jugarequested to merge
juga/sbws:maint-1.1_issue40008_chutney into maint-1.1

This mr depends (includes) !42 (closed), so it should be reviewed first.

Merge request reports