Fixed bug on missing time when using time
Merge branch 'refs/heads/3.0/develop' into 3.0/production