Contains the same new elements as #1017