Checkpoint work on model locking issues.