Merge tag 'RELEASE-3-4' into wps-merge