Merge branch 'hotfix/searching-parent-classes' into develop
Merge branch 'release/searching-parent'