automerge: 1314e9a * commit '1314e9a25921e7b87fc94db46e690b07d446237d': Adding null checks for unset stack. (Bug 18329447)