rm undefiend variable in awaiting controller
Merge branch 'develop' into 1.x-stable