Fix issue MR-603 - Some configuration options are still shown even when inheritance is enabled