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