Port Project Clockwork from 1.5.X