Updated Q&A topic
Merge branch 'dev-vesa'