Fixed bad timestamp compare
Merge branch '4.4'