Zit3110 part 2
Merge branch 'Zit3110' into dev