Update the stable branch for relaunch

no action needed, I'm just merging the updates