Merge "Revert "Add bedstead dependency"" into main