Reintegrated the missing changes in the Domino plug-in from the Jazz
refactoring