Merge branch 'changelog/adminfe' into 'develop'