Merge remote-tracking branch 'regulator/fix/tps80031' into tmp