Merge from xycaleth/openjk rate-limiting