Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s2mpu02...