Merge "Fix boot time regression on Wembley" into sc-dev