Sync'ed with ticket 1.0.0 branch