BS-8194 Edition UserCustomDefinition in progress and test correction on extra column in tables