After upgrading r0 the unit was not starting anymore.
Issues seemed related to 23c2b3ea Therefore @gao and me applied the changes in this commit which made the unit functional again.
