Re: #1257 - compatibility with new api response format