Merge "Bug fix: timestamp deviation fail test" into oc-dev