Fixed merge in idapi from merging master