Patch for an Issue #1032
Patch for an Issue #1027
Patch for an Issue #1028