(cherry picked from commit 4c7c2abf03b692e67a89d2ba0856aec1553c8ae1) Conflicts: src/server/bnetserver/Packets/BitStream.h src/server/shared/Common.h
(cherry picked from commit 4c7c2abf03b692e67a89d2ba0856aec1553c8ae1) Conflicts: src/server/bnetserver/Packets/BitStream.h src/server/shared/Common.h