Cannot unset offset in a non-array fix for 3.x branch

Thomas Kaisukarequested to merge
issue/block_class-3325640:3.0.x into 3.0.x

Merge request reports