merged some preventive action changes with branch and fixed conflicts
updated equipment status changes