While here apply the same the same to farstream PR: 196070 Submitted by: mikael.urankar@gmail.com Verified by: sbruno@