Update main to current release. See !19 (merged) for more details
mentioned in commit 871850a7
merged