This has been fixed in 8.x-4.x-dev branch. Also duplicate of #2450669