Merge "fixed timestamp validation for api"