Merge "Add logging of what derive_sdk sees"