Merge "Fix logic for logging bitmap errors" into sc-dev