Merge commit 'm/donut-release' into donut-gms