Merge "Use gettype only for debugging text"