Feature #1483: Fix automatic requirements