Merge remote-tracking branch 'regulator/topic/tps516312' into regulator-next