Merge "Add annotation support lib." into klp-ub-dev