Backport of MONDRIAN-1390 from commit 791b419295478fe4c127d34a0735c68107c85c69 in branch master.
Small change on the merge for MONDRIAN-1390. The unique names have changed.