Godmode looks for one minute ago for time comparison
Merge branch 'dev' into AccessControl