merge from feature_extension