Merge "Small print API tweaks" into klp-dev