[MERGE #7]