Changes after stash
Trying rebase
Merge branch 'master' into tests
Merge branch 'tests'
Tests with original code
Merge branch 'tests'