Addressing legitimate warning messages
Merge commit '9df45e6c2dadb8ac87a8e3cd4d4d6afffa2afa4e' into partialmerge