Merge branch 'kamira-master'