Merge "init: fixed issues related to forking services"