Merge branches 'native-backend-convert' and 'tests'