Fix bug 850656: Set based_on field correctly
Merge pull request #931 from Elchi3/new-docs-850656

Fix bug 850656: Set based_on field correctly