Merge remote-tracking branch 'regulator/for-next' into base