CLI for AE-version
auto-merge staging into master