Fixed in ce23254fa5863b82c510d0c5fa5336b2220b9bc3 using new API function defined in ce23254fa5863b82c510d0c5fa5336b2220b9bc3