Merge branches 'fixes-for-37', 'ec' and 'thermal' into release