LPS-34246 Consolidate auditedModel and groupId upgrades
LPS-34246 SF
LPS-33545 revert camelcase from 1c0a4d2885ea6ecc10c4911e4ce3021e2e3bafcd