Merge branch 'avidenic-master'