merged dev and footerchanges