create containers on demand if the optional feature is enabled, placed factory functionality in separate methods and made them protected
Authored by: grether 2009-05-04
Parent: [r6729]
Child: [r6731]
