Preparing for Kinetic Sync 2018-04-24

Thanks @k-okada for the quick work on fixes. We were able to sync today w/o any regressions.