issue #4729: Linux fixes