generic/402: Make timestamp range check conditional