Import from release 1.0.9