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