Merge "Revert ag/22195243 and solve the initialization issue it was supposed to fix differently" into udc-dev