Checkpoint for django-report-builder refactoring