WP-2578: Added configuration for Academic area