Merge branch 'nd/include-termios-for-osol' into maint