Merge branch 'bug/support_nicknym_potential_problems' into develop