quickstart changes for #973