Merge "DO NOT MERGE Fix issue with annotations test plan generation" into klp-dev