Merge "create error button should be displayed according to the feature flag"