Issue #2994970: Marged latest 8.x-5.x to 8.x-6.x branch for the [Varbase FAQs] module to make changes after Varbase 8.5.0