Merge branch 'refactor/jason' into 'develop'