Merge "Remove unnecessary arguments from disableHbm" into sc-dev