Merge "Add support for `Long` formatting"