Merge topic/master/clustering to master branch