Merge remote-tracking branch 'origin/356-compilation-fail-for-256-ue' into develop_integration_2018_w_41