strict_variables fix

Backport strict_variables fix to v1.1.x branch