Cherry-pick fixes from bugfix/10097_calc_resolution_bug into next

Changes:

    Fix calc resolution bug.

    Refs #10097.
    (cherry picked from commit 98f1327acf5f4101d2cd15e100242b25fd499e33)