Merge "[ECM] Legacy code: treat DEFAULT as ALLOWED" into main