Merge "Add lookup metadata_password param"