Avoid running several instances of encoder
Merge remote-tracking branch 'UMS/master'