[D640] manual merge