[#1850] Fixed a handful of bugs that occur when filesystem metadata is turned on.
Merge with master
Merge into master