Merge "Use FileStream API in demo." into devel/master