Merge branch 'feat-setproctitle' into 'master'