Open b18050 opened 2 weeks ago
Fix #147
Would be great to split this up into smaller PRs for 2 reasons:
Fix #147