Merge remote-tracking branch 'origin/develop' into develop
Updated importService to use new catalogue builder