Dirty hack to fix the kill after creat problem.
Merge branch 'test' into dev