Sadly no. That commit did not fix the issue. I was able to reproduce it locally (i.e. out of build service), but so far I did not make much progress debugging it.