Merge "Ignoring specific db exception to workaround Bug. 18554839." into ub-now-queens