Merge latest 'ce/8-6-stable' into '8-6-stable-ee'

Robert Speicherrequested to merge
rs-8-6-stable-ce-to-ee into 8-6-stable-ee

Merge request reports