Merge "Fixing header jump" into sc-v2-dev