Merge "add diagnosis module"