Merge "Fix Gravity start/end"