Merge "Reduce continuations for bottom area" into main