Add skiplist for 0.24.x