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