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