TDQ-9779 Remove the missing code which is added in last commit.
Merge branch 'maintenance/5.6'