To add to the sibling comments, you should avoid this scenario in the first place by hiding things behind feature flags that only apply in dev. Request 1 can g

To add to the sibling comments, you should avoid this scenario in the first place by hiding things behind feature flags that only apply in dev. Request 1 can go in fine on its own and reviewed separately Request 2 can be added feature flagged. Requests 3 and 4 would remove the respective flags for the scaffolding.