Merge branch 'feature/admin-api/support-token-header' into 'develop'