Merge branch 'footer-update'