proper PID normalisation
Merge branch 'release/2.3.3'