Merge "Fix issue #3424823: 4-corner trick causes runtime restart" into honeycomb