417.02 back-ported inverse time handling changes from edge