MOD-85 CDi bootstrap refactoring
MOD-89 CDI ButtonCell