Manual merge for #465