Merge "[UCA] Stop enforcing repository architecture" into stable/fraser