Merge branch 'sandbox-bwauth' into 'main'