This bug should be merged with #79038