feat #3608342 add in-kind options

Closes #3608342

Merge request reports

Loading