Merge branch 'update/admin-fe-20191001' into 'develop'