Point release (18/26)

Point release