Merge remote-tracking branch 'cm-11.0/cm-11.0' into new (reverted from commit fd426979f3ca3186e5e1fb0d7ec911b74b44d19d)