Merge branch 'comus-master'