WPBQA-311 Adding back the Academic Calendar term