Timob 13807 3 1 x - Allow for pseudorestart

Backport of #4252