Normal Clearing
Merge origin/master