MIFOSX-158: squash arjunk/kaizer commits into one on scheduling spike.