Merge branch 'fix/descriptions' into 'develop'