Merge "Package checks for resloving recovery tokens should be user sensitive." into klp-dev