Revert "Revert "Revert "Revert "Revert "Merge branch 'master' into Footer"""""

This reverts commit b2a9994d06849ee93e4d893cdc26d7bcb2cc85be.