Merge "Rename key_dir to metadata_key_dir and refactor"