Merge "Finish removing NEW_FOOTER flag" into tm-dev