Release for Intranet

Contains all changes from the previous fix and at the same time contains perf fixes recently merged into the upstream develop

Full Changelog: v3.11.5...v3.11.6