cherry pick ->
https://github.com/oe-alliance/e2openplugin-OpenWebif/commit/181bd90c9ce2d85b2ff621a311aeb734288b342a