Merge "Hide stackId from prying eyes." into klp-dev