init: merge cm11 branch changes