antoniop
committed
on 04 Jul 18
Port of downstream changes: use namespaced variables instead of nsvs