Point release (19/26)

Point release