3 & 4
Merge branch 'master' of https://github.com/rut-cambium/CTC_android