Actually fix the sun stage symbols position
Merge branch 'clockview' into stable
Merge branch stable