fix_import_lib_nosql_part3

Merged kk requested to merge fix_import_lib_nosql_part3 into master

fix_import_lib_nosql_part3

Merge request reports