Merge remote-tracking branch 'origin/fix-centos-compilation-2018-w08' into develop_integration_2018_w08