fix some bug
Merge remote-tracking branch 'origin/tempBranch' into didnotremovePopouController
bug fix