Ca 3.2

Merge latest release to master