Merge HQ v465 and fix some time bugs