Merge "Always include a default DocumentStack." into klp-dev