Synchronize with icon-mpim:master. Thanks to Monika Esch.
requested review from @m214002
assigned to @m300369
approved this merge request
merged