Merge branch 'hotfix/not-teen'
divides
Merge branch 'hotfix/divides' into develop