Merge pull request #16946 from rohitwaghchaure/minor_fix_debug

code cleanup