Add third-party modules
Merge branch 'master' into develop