Merge in change to the Actions api