Make time left work again
Merge branch 'ejhernandez/oc-migration-step3-ui'