Merge "modify deploy rule bug"