Merge remote-tracking branch 'upstream/v3.2-dev' into 3.2-version-in-schema