Merge "checkpoint for refactoring"