Merge "Stream Files handling CommonUtil.java"