[TBD-896]
Fix merge error.