Skip to content

Issue #3417165: Merge 3.x into 8.x-3.x

As suggested by @drumm this merges changes from 3.x into 8.x-3.x

Closes #3417165

Merge request reports