Merge "Fixed a bug where clear all wasn't translated" into nyc-dev