Merge pull request #2404 from yashdv:old_basic_structures_doc_fix