Merge branch 'v-3-0-1-near-hf' into v3-1-0-near-hf

Merge branch 'v-3-0-1-near-hf' into v3-1-0-near-hf #483