am 082c8154: (-s ours) am 1faca4cd: am 37ee68fc: Merge "Always include a default DocumentStack." into klp-dev

* commit '082c81545be6cbdf14bc91bf42b09acf54ab0816':