Merge branch 'master' into 'dev#81739_provider_uid'

Master

See merge request !2888 (merged)

Merge request reports