alpha deploy for issue 18494