Use SHA1 for CUI
Merge remote-tracking branch 'upstream/master'