Hi Heikki san, Álvaro san,
Thank you for sharing the patch.I have confirmed both patches passed the test without any issues.
Regards,Masashi KamuraFujitsu Limited