Any chance to include ITS#9990 fix in 2.5.14?