Revert "Revert "Merge branch 'safin/f1215-time-issue' into rc3.0.8""

This reverts commit 9dd204d9d0bbe100712914e7992bdd4cbf4c8e90.