JAL-1617 formatting and generics