TASK KSP-1943: Added more stubs
TASK KSP-1943: Needed to rename to match connection
Merge branch 'KSP-1943'