Merge "Fix bug in high power location attribution" into sc-v2-dev