[WIP] Merge to 3.0.31

Signed-off-by: dtrail <mnl.manz@gmail.com>