Bubble-merge wave 2

2nd merge wave, with solving some cherry-pick conflict