Merge "Adding upstream dependencies into GBP clustering"