fixed TDI-30195
Merge remote-tracking branch 'origin/maintenance/5.6'