Move parent property to config object
Merge branch 'develop'