Services autorun 3.6.x

same as #224 but targeting 3.6.x