change clock - check diff for 30mins
Merge branch 'release_v1.1'