Merge branch 'backport-kwsys' into update-kwsys