Merge branch 'hotfix/0.2.31.6'
Fix case assigned to customuser vs lilyuser
Merge branch 'hotfix/0.2.31.7' into develop