alias should now be set properly.
Merge branch 'test' into dev