UC20 Adding new backend functionality and tests
Merge branch 'local3' into UC20