merge queue: embarking master (184687a) and [#1239 + #1236] together

[mergify[bot]]

🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉

Branch master (184687a) and [#1239 + #1236] are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of [#1239 + #1236]. You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

• [X] check-success=tests

Required conditions to stay in the queue: None

---
previous_failed_batches: []
pull_requests:
  - number: 1239
  - number: 1236
...