Merge branch '2019-1-1-update-frontend' into 'develop'