core-4936 formatting