Shorten aliases
Merge branch 'master' into work-env
Add aliases for docker
Merge branch 'master' into work-env