Merge remote-tracking branches 'regulator/fix/ab3100' and 'regulator/fix/s2mps11...