Merge pull request #2216 from apache/CAUSEWAY-3676

Causeway 3676