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