SystemTaskLog fixes
merge