The compiler warnings will have to be cleaned up later (without the use of a silly macro) (cherry picked from commit 4218993bf5)
4218993bf5