2124: Fix is_original logic, add tests
Merge branch 'i-2124' into production
Merge branch 'production' into prod-test