Issue #72: add disabled infrastructure