AUI-1360 Temp formatting for testing. Will not be included in final pull