Cherry-pick fixes from feature/10113_thetain_problem into next

Changes:

    refs #10113. Set angle to none.
    (cherry picked from commit eefb823b45d1f659c2c70e9d939b5063d1554724)

    refs #10113. Fix spelling.
    (cherry picked from commit 4dc9c2e5a2833e145586fe72edce0ee5117c13cf)