Merge "BUG-47 : switched subobjects to generated source code."