PDI-11095 - Adding support for toggleable properties