Merged with GPL 374_339
Updated documentation