Merge branch 'feature/JUDDI-978' into test/testmerge
resolves all ci/testing isssues