Merge "FFix the Bug of Missing fields on View Screen"