Backport #884 to release/2.5.0 branch

Same changes... different target branch... I need this to build a new Docker container and upload it.