LPS-41805
LPS-41805 SF
LPS-41805 SF
LPS-41630 adding back Old Calendar verifier

Partial reversion from 3726f1b30fdfd65b7f2859a39f653f806f9b33ab
LPS-41630 Minor SF