Merge pull request #9734 from cotequeiroz/tang_noman