Merge "Another asset drop, provider icons, tests." into klp-dev