Merge branch 'jk/lib-terminal-lazy' into maint