Merged with developer's clone