Merge "Simplify dreaming flows" into main