This patch will work for 8.x-1.x-dev version.
Thanks!