Fix empty support list
Merge remote-tracking branch 'alban/feature/project-support' into feature/project-support