Merge branch 'feature-argument-abbreviations' into develop