Originally created by @sajolida on #15423 (Redmine)
See 5d8edf99 and 555cf22e.
Parent Task: #14594 (closed)