Merge commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd' * commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd': Avoid signaling a format change to the client if its insubstantial.
Merge commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd' * commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd': Avoid signaling a format change to the client if its insubstantial.