Merge "LE: Add instance ID to descriptors (1/4)" into klp-dev