automerge: 4ff2526 * commit '4ff2526ef8d168d3c591f1a19de4dca76745c157': Adding null checks for unset stack. (Bug 18329447)