Merge branches 'sh/urgent' and 'sh/regulator' into sh-latest