Merge "Fix a Bug on Checking Required Fields"