Checkpoint mirgrating master changes onto cassandra branch