Merge bmake-20211212commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'(cherry picked from commit 129043849f62f9cfa72f6fae68417d9995860f3f)