Merge branch 'develop'
Finish sample/project operation for top hat