Clean shit choice definitions
Merge branch 'refs/heads/3.0/develop' into AIWS/production