Merge 'master' into 'jason-android'

[alexlapa]

Superseeded by #193

Checklist

• Created PR:
  • [x] In draft mode
  • [x] Name contains Draft: prefix
  • [x] Name contains issue reference
  • [x] Has k:: labels applied
  • [x] Has assignee
• [x] Documentation is updated (if required)
• [x] Tests are updated (if required)
• [x] Changes conform code style
• [x] CHANGELOG entry is added (if required)
• [x] FCM (final commit message) is posted
  • [ ] and approved
• [ ] Review is completed and changes are approved
• Before merge:
  • [ ] Milestone is set
  • [ ] PR's name and description are correct and up-to-date
  • [ ] Draft: prefix is removed
  • [ ] All temporary labels are removed

[alexlapa]

FCM:

Merge #master into #jason-android (#192)