[Bug Fix] Ticket #380790
Merge branch 'master' of github.com:ist-dsi/fenix