Merge branch 'hotfix/gem'
Merge branch 'develop'
latest appraisals
Merge branch 'hotfix/appraisals' into develop