[TASK] Skip inheritance controls for non-Fields
Merge pull request #230 from NamelessCoder/bugfixes

[TASK] Skip inheritance controls for non-Fields