Change process return value generation
Merge commit 'b3a13ccb5c98956f75a5f1013529f6380cf2bcec'