Merge "Revert "Remove searchable metadata."" into klp-dev