Merge branch 'bootstrap-intel' into release-3.17

Merge-request: !5057