Merge branch 'release/2.17.0' into develop
Bumped version
Restore previous section Building Facilities
Merge branch 'release/2.18.0'