[FANCOM-ADDON] - merge dev branch