Merge "replacing usages of the deprecated Bedstead annotations with the new equivalents" into main