field Locking issues and defects

2614
2616