Merge "Fix for issue 3371667: fix source code compilation warnings (4)"