Merge pull request #2225 from apache/CAUSEWAY-3688

Causeway 3688