Build active architecture for debugging
Merge branch 'master' into develop