more FAQs on ALT mapping
Merge branch 'dev'