ensure the file attributes can be passed in
Merge remote-tracking branch 'remotes/origin/master' into l5-unstable