Stable7 issue/10847