am bfa4e045: (-s ours) am e14c0f63: am 3fe4027f: Merge "Enhance diagnostic options."

* commit 'bfa4e0456368e5db65961cdacad10dc0de27ff4a':