TDI-31099:Shared components not in sync with SVN.
Merge branch 'maintenance/5.6'