WEB-4552 - Common names were sometimes being added with the nil ID of 4.