Merge "Only go back when on complete apply" into main