Add -A option to CLI to define aliases for created entity IDs
Merge remote-tracking branch 'origin/master'