master
refactor(core): align code changes to the rest of the codebase
test(sample/01) fix broken tests