Merge "Pre-cleanup before unifying Task and Stack (82/n)"