Description

Safety checklist

This change is backwards compatible and safe to apply by existing users
This change will NOT lead to data loss
This change will NOT lead to downtime who already has an env/service setup

How has this change been tested, beside unit tests?

YOUR_ANSWER