Merge "bm: Avoid to use CDT number" into main