X-Road
X-Road copied to clipboard
XRDDEV-1932-2091 Merge conflict fixes
developt-7.x
==(PULL)=> XRDDEV-1932-2091-add-members-and-identifiers-refacto
= XRDDEV-1932-2091-add-members-and-identifiers-refacto-merge-conflict-fix