siit: merge r13890 & r13937 to 8.09