Merge "remove primary condition check on storage format." into klp-dev