Yesterday
merge from sky_circle_fix