Merge commit '597296efb5c7727294b69c3c756d71ae1c509eb1' * commit '597296efb5c7727294b69c3c756d71ae1c509eb1': Remove deprecated openInputStream factory method