Merge pull request #2034 from metalivedev/1969-cherrypick-fixcommitformat

Fix #1969 formatting, add information about multiline json