Update compatibility with 4.0 and unify meta information
Manual merge