Initial changes to enable use of the 1.4 beta API.