Issue #3411878: Fix existing block ID being overridden

Matthijs Van Asscherequested to merge
issue/rocketship_core-3548136:3548136-dont-override-existing into 6.2.x

Closes #3548136

Merge request reports