Former Merge to 8.0 task of PIKE-91 (#8091). See it for details.
Imported from https://youtrack.roxen.com/issue/PIKE-92
Reported by Roxen Scrum Team roxenscrumteam@roxen.com
Imported from https://youtrack.roxen.com/issue/PIKE-92
Reported by Roxen Scrum Team roxenscrumteam@roxen.com