Fixing uniquename problem with prefices/suffices
Merge branch 'dev' into ms