Bug fix #7638 and #7639.