Backport vol_award fix & ID support