apply content of https://issues.apache.org/jira/browse/GORA-326 patch
apply content of https://issues.apache.org/jira/browse/GORA-326 patch