Form messages before finishing

Change-Id: Iefb41d761dd98b08914c8960836964b1f363deef
Merge "Form messages before finishing"