Merge "Updated textfields Bug: 5076695"