Merge "Update Z documentation to avoid hidden API"