merge #7639