Merge commit '9e8b6821afad923dcc616768f7582545c90a0bc6' * commit '9e8b6821afad923dcc616768f7582545c90a0bc6': Modify openInputStream function to add inputSource type