use Set to prevent duplicates
Merge branch 'inject' into dev