fix installer
Fix installer again
Merge branch 'infcp' into develop