Merge "Fix the issue where response is built on rollback"