Merge pull request #778 from abarth/parent_data_fixes

Parent data fixes