Rebase from 1.0.1