Rebase cm-11.0 under intervigilium's progress (Previous now cm-11.0-old)