* commit 'b85787411085bbea0ac725135cae02a4167b7aa7': Fix issue #3424823: 4-corner trick causes runtime restart