Mantis 6209: Add missing definitions
Mantis 6209: Clarification