Merge branch 'mh/use-wincred-from-system'