fixing build on TC server
Merge remote-tracking branch 'origin/develop-SN' into develop-MW