Merge pull request #8758 from cotequeiroz/noddos_fixes