Upright without smart brim
This is the upright merge !272 (merged) without the smartbrim changes. Created as a separate MR in case of rebase problems.
This is the upright merge !272 (merged) without the smartbrim changes. Created as a separate MR in case of rebase problems.