Merge change 4066

* changes:
  Improve nested variable test.