Resolve #3499552 "Use 8.4 compatible on origin"

dpirequested to merge
3499552-use-8.4-compatible-on-origin into 1.x

Closes #3499552

!15 (merged) but created by @dpi and in origin repo

Merge request reports