PR with base on master

+---------------+-----+
| Q             | A   |
| ---           | --- |
| Bug fix?      | y   |
| New feature?  | n   |
| BC breaks?    | n   |
| Deprecations? | n   |
| Tests pass?   | y   |
| Fixed tickets | #1  |
| License       | MIT |
| Doc PR        |     |
+---------------+-----+