Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218...