Merge remote-tracking branch 'regulator/fix/s2mps11' into tmp