Cherry-pick fixes from feature/9980_wish_idf into next

Changes:

    refs #9980. Idfs updated.
    (cherry picked from commit fe35c90f7d501d6f19f302bbd12171e309abdd79)