Patch Set 1: Looks good to me, approved; IP review completed

Thanks, Shawn!
I would think that it is sufficient to fix this in master because there is the workaround to manually set the filemode property to false later on.