Merge "EC: add bug number in TODO comment about registrations failing"