Merge pull request #2217 from apache/CAUSEWAY-3676

Causeway 3676