* Add coherency between check and normal mode see issue #24633 * Add changelog fragment for the PR * Make change following PR comment * Remove trailing whitespace