Merge branch 'update/adminfe-20200121-part2' into 'develop'