Make sure RequestId is not coerced as int
#1178
+12
−3
Merged