Merge "[Role Logic Move] Create feature flag" into main