Merge from kaiwei's branch 'fwaas'