Merge "Add units to getLatchTime" into main