Re-add time
This reverts commit 3c30d22d661c96f97f34456021bdad219b5d5394.
Re-add time

This reverts commit 3c30d22d661c96f97f34456021bdad219b5d5394.
Merge branch 'master' into develop