alpha for issue/25164