Avoid to perform action after fragment is finished.
Fix clearUp().
Do refactor.
Merge branch 'master' into Dev