Merge branch 'feature/auto_desc' into develop