Merge branch 'majic-dep' into 'develop'