Merge "Can't show 5GE at summary" into sc-dev