rebase 11.25 & 11.26 & 11.27