ECMS-5624: Format patch