Merge in changes from newer testing version