ZP-1142 update based on remarks in pull request. Released under the Affero GNU General Public License (AGPL) version 3.