Patch for WW-4113 (https://issues.apache.org/jira/browse/WW-4113)

)