Merge branch 'vs-16.4-custom-command-inputs' into release-3.15

Merge-request: !4297