Merge "DO NOT MERGE : fix useless import"