Reinstate release-merge timeout tweak