Merge pull request #2222 from apache/CAUSEWAY-3676

Causeway 3676