yotaservice moved to other process
merge + fixes