Merge pull request #2221 from apache/CAUSEWAY-3676

Causeway 3676