activation code flow, select stream changes, timer in question render
merged conflicts