bugfix/ZP-895-integer-ids-can-trigger-name-switches

Released under the Affero GNU General Public License (AGPL) version 3.