fixed merge error
Merge branch 'lazy_document_registration' into iekho_master