UC3 topology model
Merge branch 'master' into development