Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend