Merge branch 'feature/test-external-commands-5345' into next

resolves #5345