v1.0.3 cherrypicking part 2

This cherry-pick merge request contains the changes from the following merge requests, which should also end up in v1.0.3:

• !278 (merged)
• !280 (merged)
• !281 (merged)
• !282 (merged)