[PATCH v4 1/3] Update 2 files