Patch for optional configurations objects
Merged
Merged