Merge "Avoid NullPointerException in Arrays.stream" into qt-dev