Issue #3216927: Improve update 8005

Eelke Blok requested to merge issue/private_message-3216927:3216927-improve-update-8005 into 8.x-2.x Jun 04, 2021