Reproducing variable based property issue
Started on maintaining our own parent stack
Removed unnecessary parent stack
Fixed up case further and all tests are green
Release 2.1.0