Former Merge to 8.0 and master task of PIKE-177 (#8177). See it for details.

Imported from https://youtrack.roxen.com/issue/PIKE-180

Reported by Roxen Scrum Team roxenscrumteam@roxen.com

Blocking PIKE-177