Converted concepts chapter
Resolve conflicts from cherry-picking merge