Fixed clear field
Merge Master