- Added option to display some system types using their short name
Merge branch 'master' into metadata