Implement active key document
Implement multi uid support
Fix comments
Merge branch 'feature/6299_new_doc' into develop