Merge "Roll-forward of "Add bedstead dependency"" into main