modules support, list modules and contacts
Merge commit 'github/testing' into beta