Changes made to #9934