Test for DB-4497
Fix for DB-4497