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