Fixed regression for dynamic parent
bug #1579 Fixed regression for dynamic parent (hason)

This PR was merged into the 1.16-dev branch.

Discussion
----------

Fixed regression for dynamic parent

Fixes #1578

Commits
-------

d2fc98d Fixed regression for dynamic parent