This MR merges 9-3-stable into 9-3-stable-ee-patch-6 to prepare 9.3.6 release.
9-3-stable
9-3-stable-ee-patch-6
9.3.6