staging deploy for issue #17925