Fixed the issues.

Closes #3373757

added 1 commit

• db402203 - 3373757-fix-the-issues: Fixed the issue mentioned in #4.

Compare with previous version

added 6 commits

• db402203...313ae021 - 5 commits from branch project:8.x-1.x
• 861dc74d - Merge branch bootstrap_pages:8.x-1.x into 3373757-fix-the-issues

Compare with previous version

merged