resolve CLI alias when checking task status
Merge remote-tracking branch 'origin/master'