I have attached a patch for the issue and added after-patch screenshots for r...