Merge branch 'origin/feature/Thumbnail'
cleanup git