Rearrange footer.
Merge commit