Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint