Resolve #3050027 "Inline blocks on"

Closes #3050027

added 10 commits

• 13bcd448...5dd85af8 - 9 commits from branch project:2.x
• 6bbf0113 - Merge branch '2.x' into 3050027-inline-blocks-on

Compare with previous version

added 3 commits

• 6bbf0113...23ce887f - 2 commits from branch project:2.x
• fd03a677 - Merge branch '2.x' into 3050027-inline-blocks-on

Compare with previous version