Handle empty variable groups

Merge svir-qgis-build-nonplatform-tree first