[TBD-896]
Fix merge error.
Merge branch 'maintenance/5.6'