# Conflicts:
#	doc/analysis/requests.py

# Conflicts:
#	TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_15.robot

Merge remote-tracking branch 'origin/feature/add-aggregated-temporal-evolution-tests' into parsespec

# Conflicts:
#	doc/tests/test_ContextInformation_Consumption.py

Merge remote-tracking branch 'origin/feature/add-simplified-temporal-evolution-tests' into parsespec

added another tag, used the global context variable and added test case to the file generating the doc

- feat: add TC for deletion the scope attribute in an entity
- feat: add TC for append of a scope attribute to an entity
- feat: add TC for update of a scope in an entity

Resolve the missing description of the Check operation 'Check Dictionary Might Contain Additional Members'

Merge remote-tracking branch 'origin/feature/tcs-add-throttling-to-subscription' into feature/tcs-add-throttling-to-subscription