Ticket 47569 - Fix build warnings
    
    The previous commit for this ticket introduced some build warnings.
    This patch corrects the build warnings.
    (cherry picked from commit 01df89d34528a4551e079973a78586c87d521ba1)