Now, with non-repeatable boot failures, anything is possible, and Sami does mention 6.1.30 as good (implying that 6.1.31 might not be -
6.1.34 is ok
Sami - awaiting your results.
I cherry-picked that commit 13bb06f8dd42071cb9a49f6e21099eea05d4b856 on top of 6.4-rc7 and it does not fix the issue for me.
—Sami