Merge "Refactor OHM to use (float)offset for translating windows" into sc-dev