[Task] Clean up
Merge origin/master