Merge branch 'topic/CID12115' into devel
Add CID 7478 from Symbola
Merge branch 'devel' into topic/symbols

Modify CID 12115