bring in some old changes for QF deploys