Merge "Stop trying to get/set fields in FDE footer" into tm-dev