Changes regarding #1301764