Merge remote-tracking branch 'regmap/fix/core' into tmp