Merged with feature_smartBot