Merge "fix doctor trigger files"