Merge branch other/next-release into main