merged quickstart changes