ACT-1897: Fixing issue with form-properties in property-panel