Merge "Support overriding calling package in Documents." into klp-dev