convert patch #15 in mr

Closes #3415509

added 5 commits

• 36d0cfa5...f393eab2 - 4 commits from branch project:8.x-1.x
• ba0f549e - Merge branch '8.x-1.x' into '3415509-stripped'

Compare with previous version