Merge "Refactor the HBM layer and add completion callbacks" into sc-dev