Merge bmake-20240520
Merge commit '29efb3dcaedd9cbabc6f96f35545baf2c8b28501'
(cherry picked from commit 9d3df31ec06fe91c5c67da464f11408474d57174)