Format code.
Minor - format code.
Minor - format code.
Do not rename work folder, this generates unlinked documents

see BT#8773
Minor - format code.