Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555...