Merge branch '2019-02-21-update-frontend' into 'develop'