Merge sm-jorith sm-stefan