JAH-211 forwarder bug fix, JAH-222 metric rename