Merge "Clean up for multiple validation result update"