Merge "Skip track if verification fails" into klp-dev