Merge branch 'cmake-option-parsing' into release-3.13

Merge-request: !2799