[BUGFIX] Merge the fal properties correctly #595
Merge pull request #596 from mhirdes/development

[BUGFIX] Merge the fal properties correctly #595