Add extra patch for fixing output message and partially revert 2ad3c30d9ef0cc1ea2c7df...